rustc_codegen_ssa: generate MSVC cleanup pads on demand, like GNU landing pads. #85316
+109
−112
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
|
On MSVC, I was able to bootstrap, and build Also, rebasing #84993 on this PR did indeed fix the test failure there (i.e. MSVC and GNU styles indeed agree on the LLVM block order). So I'm un-drafting this PR, it's ready for review I think. Also, in case anything goes wrong, in the interest of easy bisecting: |
nagisa
reviewed
May 16, 2021
| /// This stores the landing-pad block for a given BB, computed lazily on GNU | ||
| /// and eagerly on MSVC. | ||
| /// This stores the cached landing/cleanup pad block for a given BB. | ||
| // FIXME(eddyb) rename this to `eh_pads`. |
There was a problem hiding this comment.
Any reason these renames aren't happening now?
There was a problem hiding this comment.
I can add a commit for them if you want, no particular reason, was focusing on getting it working and tested first.
|
@bors r+ |
|
📌 Commit cb23a79 has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This unblocks #84993 in terms of codegen tests, as it brings the MSVC-style (
cleanup_pad) EH (LLVM) block order in line with the GNU-style (landing_pad) EH (LLVM) block order, by having both of them be on-demand (instead of MSVC-style being eager and GNU-style lazy/on-demand).It also unifies the two implementations a bit, similar to #84699, but in the opposite direction (as that attempt made both kinds of EH pads eagerly built).
Opening as draft because I haven't done enough Windows testing just yet, of both this PR, and of #84993 rebased on it.(EDIT: seems to be working as expected)r? @nagisa